Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 1 Jul 2010 22:47:18 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 1 Jul 2010 22:47:18 +0000 (22:47 +0000)

Trivial merge